From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 20 Sep 2011 20:57:57 +0000 (-0700)
Subject: Merge from source.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~6
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=206613f85758ac841eaac1bb27ac45a661c5132f;p=emacs.git

Merge from source.
---

206613f85758ac841eaac1bb27ac45a661c5132f